From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 05:11:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6138b628138c110e647a5835440a3f183d1cab50;p=emacs.git

merge from trunk
---

6138b628138c110e647a5835440a3f183d1cab50